Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

master(dm): add cluster id as unique identification of dm-cluster and optimize error message of code:30008 #4493

Merged
merged 15 commits into from
Feb 8, 2022
Merged

master(dm): add cluster id as unique identification of dm-cluster and optimize error message of code:30008 #4493

merged 15 commits into from
Feb 8, 2022

Conversation

niubell
Copy link
Contributor

@niubell niubell commented Jan 27, 2022 •
edited by lance6716
Loading

What problem does this PR solve?

Issue Number: close #4370, close #4456, close #3830

What is changed and how it works?

Check List

Tests

  • Unit test

Code changes

Side effects

Related changes

  • Need to cherry-pick to the release branch

Release note 

add cluster id as unique identification of dm-cluster and optimize error message of code:30008

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jan 27, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • D3Hunter
  • Ehco1996

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 27, 2022
@lance6716 lance6716 added the area/dm Issues or PRs related to DM. label Jan 27, 2022
@niubell niubell removed needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. labels Jan 27, 2022
@lance6716 lance6716 changed the title [DM]: add cluster id as unique identification of dm-cluster and optimize error message of code:30008 master(dm): add cluster id as unique identification of dm-cluster and optimize error message of code:30008 Jan 27, 2022
@ti-chi-bot ti-chi-bot added needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. labels Jan 27, 2022
D3Hunter
D3Hunter reviewed Jan 27, 2022
View reviewed changes
Ehco1996
Ehco1996 reviewed Jan 27, 2022
View reviewed changes
@niubell niubell removed needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. labels Jan 27, 2022
@niubell niubell requested review from D3Hunter and Ehco1996 and removed request for GMHDBJD January 27, 2022 09:55
D3Hunter
D3Hunter reviewed Jan 27, 2022
View reviewed changes
Copy link
Contributor

@D3Hunter D3Hunter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rest LGTM

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jan 28, 2022
@Ehco1996
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 78b7219

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 28, 2022
@niubell niubell requested review from Ehco1996 and D3Hunter January 28, 2022 09:32
@Mini256
Copy link
Member

Mini256 commented Jan 28, 2022

/check-issue-triage-complete

@lance6716
Copy link
Contributor

/check-issue-triage-complete

1 similar comment
@lance6716
Copy link
Contributor

/check-issue-triage-complete

@Mini256
Copy link
Member

Mini256 commented Jan 28, 2022 •
edited
Loading

/check-issue-triage-complete

Fixed.

@lance6716
Copy link
Contributor

/run-verify

@Ehco1996
Copy link
Contributor

Ehco1996 commented Feb 7, 2022

[2022-01-28T17:08:42.949Z] coverage: 15.6% of statements
[2022-01-28T17:08:42.949Z] panic: test timed out after 5m0s

seems there is a deadlock in current ut, ptal @niubell

@D3Hunter
Copy link
Contributor

D3Hunter commented Feb 7, 2022

/run-verify

@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 7, 2022
@niubell
Copy link
Contributor Author

niubell commented Feb 8, 2022

/run-verify

@ti-chi-bot ti-chi-bot removed status/can-merge Indicates a PR has been approved by a committer. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Feb 8, 2022
@codecov-commenter
Copy link

codecov-commenter commented Feb 8, 2022 •
edited
Loading

Codecov Report

Merging #4493 (d7fa036) into master (9607554) will decrease coverage by 0.0834%.
The diff coverage is 58.4415%.

Flag Coverage Δ
cdc 60.2713% <66.7224%> (+0.3491%) ⬆️
dm 51.5660% <50.6309%> (-0.4629%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@@               Coverage Diff                @@
##             master      #4493        +/-   ##
================================================
- Coverage   55.6402%   55.5568%   -0.0835%     
================================================
  Files           494        502         +8     
  Lines         61283      62374      +1091     
================================================
+ Hits          34098      34653       +555     
- Misses        23750      24267       +517     
- Partials       3435       3454        +19

@Ehco1996
Copy link
Contributor

Ehco1996 commented Feb 8, 2022

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: d7fa036

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 8, 2022
@niubell
Copy link
Contributor Author

niubell commented Feb 8, 2022

/run-kafka-integration-test

@ti-chi-bot ti-chi-bot merged commit da0dda8 into pingcap:master Feb 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lance6716 lance6716 Awaiting requested review from lance6716

@Ehco1996 Ehco1996 Awaiting requested review from Ehco1996

@D3Hunter D3Hunter Awaiting requested review from D3Hunter

Assignees
No one assigned
Labels
area/dm Issues or PRs related to DM. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
9 participants
@niubell @ti-chi-bot @Ehco1996 @Mini256 @lance6716 @D3Hunter @codecov-commenter @jerrylisl @buchuitoudegou